[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-049eb38c3a6f461fb6edd46cfd39b59c", "presubmit-am-1488ce33ef094047acc7ba0f5b28a7bd" into tm-dev am: da965adc am: c6252126 -s ours

am skip reason: Merged-In I9bdd1a4bf5b14542adb901f264a91d489115c89b with SHA-1 60d8318c is already in history

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

Change-Id: Iae083fce7a60edd3c816268fd2d567e77ab275e7