[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-eff2a387dc434e1ab6d0febedea6b507" into sc-mainline-prod am: 94f7d680 -s ours

am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 73745b16 is already in history

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

Change-Id: If3e170bfdc961398605e1b2096f3ae68320a7959