Merge changes from topic "am-819049f8266b4d2fb689603771716a56" into...

Merge changes from topic "am-819049f8266b4d2fb689603771716a56" into udc-qpr-dev-plus-aosp am: 2819fe48

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



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