[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-082f69b6e78b4ed2b3d64a2becd00f57" into sc-mainline-prod am: 045d1a61 -s ours am: acf150f3 -s ours am: 06ce15e5 -s ours am: a25b74f0 -s ours

am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 73d53359 is already in history

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



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