Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp am: bcff8ec5

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



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