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

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



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