Merge changes from topic "am-3c3f3b161cdd439a9168a2e9eb839962" into...

Merge changes from topic "am-3c3f3b161cdd439a9168a2e9eb839962" into udc-d1-dev-plus-aosp am: ed52f310

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



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