[automerger skipped] Merge "Merge SP1A.211205.008" am: a201cdea am:...

[automerger skipped] Merge "Merge SP1A.211205.008" am: a201cdea am: 6d6f626a -s ours am: 9fda6e53 -s ours

am skip reason: Merged-In Id5cd4123f1bb7bdd85e564fc6997dfbc50652a5f with SHA-1 11dd6452 is already in history

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

Change-Id: Ie3a7cf937ae2c71d5d253e15bc84e7032a8df5a7