Merge changes from topic "am-62ae382898bb4b39a6c7d9fa84314e11" into...

Merge changes from topic "am-62ae382898bb4b39a6c7d9fa84314e11" into udc-dev-plus-aosp am: 688378c9

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



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