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

Merge changes from topic "am-3e4492d356244036aafd099f5cc041b3" into udc-d1-dev-plus-aosp am: b40501d0 am: a84b4b1a

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



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