Merge "Merge SP1A.211205.008" am: a201cdea9c

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

Change-Id: I8eecac2c6cf10e09fc58f1be6807dde655484c29