Merge changes from topic "am-a64cc033772f4d118a62254b6df2c019" into udc-qpr-dev am: 3f4c86f1

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



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