Merge "Do not unregister CONSTRAIN_DISPLAY_APIS for WmTests" into tm-dev am: c46b5540 am: af0114f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17292203

Change-Id: I2a1c4b20a95f5a812ce3d69885127805645b9728