Merge changes from topic "b249277686_shadeCs" into udc-qpr-dev am: 2904a182

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



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