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: 4143674d

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



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