Merge changes from topic "am-35ea6d117ec04695bc65493337e8d17a" into...

Merge changes from topic "am-35ea6d117ec04695bc65493337e8d17a" into udc-qpr-dev-plus-aosp am: e01cc24c

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



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