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: 9e73cda2 am: 6e7ea61e" into udc-qpr-dev-plus-aosp am: bd5a52f2

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



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