Merge changes from topic "am-0bb9b88a883e47a48db0f1853073eaad" into...

Merge changes from topic "am-0bb9b88a883e47a48db0f1853073eaad" into udc-qpr-dev-plus-aosp am: 8fba6829

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



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