Merge changes from topic "am-66dc38f741814b9bb0d482c3368930f9" into...

Merge changes from topic "am-66dc38f741814b9bb0d482c3368930f9" into udc-d1-dev-plus-aosp am: 25affe37 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 f83f592d is already in history

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



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