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

Merge changes from topic "am-e6843eeac9f947129e936022fcad1814" into udc-qpr-dev-plus-aosp am: 6f3a05ec

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



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