Merge changes from topic "am-ea6b045cce80455a98e30b4454d88732" into...

Merge changes from topic "am-ea6b045cce80455a98e30b4454d88732" into udc-qpr-dev-plus-aosp am: 32f94bf7

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



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