Merge changes from topic "am-81b4929b38b1412caad8f4ab6f10499f" into...

Merge changes from topic "am-81b4929b38b1412caad8f4ab6f10499f" into udc-qpr-dev-plus-aosp am: c5b74da9

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



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