Merge changes from topic "am-c26c85c9b4a5456b914b32f130c3a479" into udc-qpr-dev-plus-aosp am: 2ad1ad56

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



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