[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-3be6d6c2f90748918b56ded29d1fff32" into udc-dev-plus-aosp am: 991c1d32 -s ours am: 6d24a020 -s ours

am skip reason: Merged-In I384f8e230c909d8fc8e5f147e2fd3558fec44626 with SHA-1 4ddfad25 is already in history

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



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