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

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

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