Merge "Merge "Reduce dependency of real device for wm unit test" into udc-dev...

Merge "Merge "Reduce dependency of real device for wm unit test" into udc-dev am: daf02895 am: 4143674d am: 7233549f" into udc-qpr-dev-plus-aosp am: 870ff2c1

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



Change-Id: Icb4e4b46cf680bc0d69e3d4acef797aa7008160d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>