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

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

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 6a278c39 is already in history

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



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