Merge changes from topic "am-155e3ebdda1a4ac784de2d0e3ee914f5" into...

Merge changes from topic "am-155e3ebdda1a4ac784de2d0e3ee914f5" into udc-qpr-dev-plus-aosp am: c515cdca

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



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