Merge changes from topic "am-87b1f0388a1e400cb587a79ce96126ce" into...

Merge changes from topic "am-87b1f0388a1e400cb587a79ce96126ce" into udc-qpr-dev-plus-aosp am: 563ef033

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



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