[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-a8421206bd26452e95f6cad042b4b6bc", "presubmit-am-db10d76a65b5494fb2108722543f3813" into tm-dev am: c4ab8175 am: ebafc9a5 -s ours

am skip reason: Merged-In I78354a0f1d955c5b7c1ead044ea49086b3479841 with SHA-1 a3a06ac2 is already in history

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

Change-Id: I4de32c8c0f0f8387bb85176ac77d35d52938cf21