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

Merge changes from topic "am-abeeeb4b43c14bdb8288791378a8a8fd" into udc-d1-dev-plus-aosp am: 882a66f0

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



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