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

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



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