[automerger skipped] Merge TP1A.221105.002 to aosp-master - DO NOT MERGE am: 0de01a98 -s ours

am skip reason: Merged-In I7caa2e966bae2ec146ca77b36d2a467d746e2531 with SHA-1 6804c6a1 is already in history

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



Change-Id: I40d72e4ddbbc0a7b76e93a52b96e75523b3b173f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>