Merge changes from topic "am-4661055aab9748e7aab4b0ac1000f79b" into...

Merge changes from topic "am-4661055aab9748e7aab4b0ac1000f79b" into udc-d1-dev-plus-aosp am: e6602d2c am: 3b4a6f4c

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



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