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

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



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