[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c5ec16bd9ddd4a4b98e3002bb6f376e2" into udc-d1-dev-plus-aosp am: 40e37e68 -s ours am: cd7b304b -s ours

am skip reason: Merged-In Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 with SHA-1 ffae193f is already in history

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



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