Merge changes from topic "am-4f5f9f35b2ab43e9bbf3b179d099a26d" into...

Merge changes from topic "am-4f5f9f35b2ab43e9bbf3b179d099a26d" into udc-qpr-dev-plus-aosp am: c0bb65ee

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



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