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

Merge changes from topic "am-a5d378f30fe64a91ae15b36dee056d2c" into udc-d1-dev-plus-aosp am: 3be61fbc -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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