Merge changes from topic "am-6e3f1dd89e204d72a14b541dfe045440" into...

Merge changes from topic "am-6e3f1dd89e204d72a14b541dfe045440" into udc-d1-dev-plus-aosp am: da020d0d

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



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