Merge "Support running WMShellUnitTests from studio" into tm-qpr-dev am: d69a267b

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



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