[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-mainline-prod am: 4172cdb6 -s ours am: 2c992344 -s ours am: 5348129b -s ours am: a7a28f37 -s ours am: 610127e9 -s ours

am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 6888543d is already in history

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



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