[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b09c80ff3c8b429fa2c389187f5d9864" into sc-qpr1-dev am: 7ebb45fa -s ours am: a23ed4a4 -s ours am: 73423a26 -s ours

am skip reason: Merged-In I59cf3c21edce836ffbe9f24a08b3a8e077c5fcf3 with SHA-1 08d14944 is already in history

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

Change-Id: I5555b57531960a2fa324719a0afd646e5c027e41