Merge "Do not unregister CONSTRAIN_DISPLAY_APIS for WmTests" into tm-dev