[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-1ab3ffc180ef400a970f85dbe14238c7-sc-dev" into tm-dev am: 719b6d79 -s ours

am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 08d94cba is already in history

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

Change-Id: I982e8875acd620a9a5447be544b3fc74bbe86b30