[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-6ed0d060bcae44a98c678a2a35b2004c" into tm-mainline-prod am: 7e01a4df -s ours

am skip reason: Merged-In I5018fc3ed772f3b1b80402968d96fc4d7333c613 with SHA-1 88cfc311 is already in history

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

Change-Id: I63faae4b5aef3d4bc20418416a49bc7d2f054fa4