Merge "Merge "Disable KeyguardSliceViewControllerTest on watch." into udc-dev...

Merge "Merge "Disable KeyguardSliceViewControllerTest on watch." into udc-dev am: dfab3209 am: 7190cce6 am: e792c1a8" into udc-qpr-dev-plus-aosp am: dcb2f119

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



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