Merge changes from topic "am-9a0effb20ed94241acab5dc7fd3ee86f" into...

Merge changes from topic "am-9a0effb20ed94241acab5dc7fd3ee86f" into udc-d1-dev-plus-aosp am: 4b17ee17

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



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