Merge changes from topic "am-ee6dbf77b333473b82fa2f6c516dd192" into udc-d1-dev-plus-aosp am: b9edd6ef -s ours

am skip reason: Merged-In I28d8a471b1da95c9eb59cddfcd1d932364a41c50 with SHA-1 13951afe is already in history

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



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