[automerger skipped] Merge changes Iae65d604,I3024443c into sc-v2-dev am:...

[automerger skipped] Merge changes Iae65d604,I3024443c into sc-v2-dev am: 881f90de am: 9aaf9fbb -s ours

am skip reason: Merged-In Iae65d6047c02dae241f2df21c666a03cca58fd0b with SHA-1 1230839d is already in history

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

Change-Id: I51095eeec6a316a264879814c67ba9122761aea7