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

Merge changes from topic "am-b74f20b3aa4d416387d605e8575f6f90" into udc-d1-dev-plus-aosp am: 8dc50180

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



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