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

Merge "Reduce dependency of real device for wm unit test" into udc-dev am: daf02895 am: 9e73cda2

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



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