[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L74600000953556228:N38300001245104065" into tm-dev am: 36ad81c4 -s ours am: 2930154a -s ours

am skip reason: Merged-In Id023f8ec97f243ad016ca7f8ad5515b05c0f8000 with SHA-1 5e1fc990 is already in history

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

Change-Id: I21fe7711a8a1f37c74d10f59cfda7b16d58a55e1