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

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

am skip reason: Merged-In I2917c8331b6d56caaa9a6479bcd9a2d089f5f503 with SHA-1 2c993153 is already in history

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



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