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

Merge changes from topic "am-c56d790cffa2429cb24baa890b1689d4" into udc-d1-dev-plus-aosp am: 72977ded

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



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