Merge changes from topic "am-6527530a1c344b08affb8fe94c931182" into...

Merge changes from topic "am-6527530a1c344b08affb8fe94c931182" into udc-qpr-dev-plus-aosp am: d35b8ab3

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



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