[automerger skipped] Merge "Merge SP1A.211205.008" am: a201cdea9c am: 6d6f626a41 -s ours

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

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

Change-Id: I3bf6a51b97bad207981adaadc7c0ea3699f5513f