Merge "Add config test Flicker Service WMShell tests" into udc-qpr-dev am: 24b72bdf

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



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