Merge changes from topic "am-916ea840956749219d2137c85157d349" into...

Merge changes from topic "am-916ea840956749219d2137c85157d349" into udc-d1-dev-plus-aosp am: 77661668 am: ccda01d6

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



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