Merge changes from topic "am-08880425f37a46df905b5de897026042" into udc-qpr-dev-plus-aosp am: 194f6c1e

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



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