Merge changes from topic "am-ca270e0b7acf4d82b05eea7e06d7b8d0" into...

Merge changes from topic "am-ca270e0b7acf4d82b05eea7e06d7b8d0" into udc-d1-dev-plus-aosp am: b3408485 -s ours

am skip reason: Merged-In I4ef415437568ae165ac5a3153d18bd2e2ef1f808 with SHA-1 69f9efe5 is already in history

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



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