[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT...

[automerger skipped] Merge "Merge TP1A.220905.004 to aosp-master - DO NOT MERGE" am: 9f510b16 -s ours

am skip reason: Merged-In I3f9a35cbcb4b5c93c16e9bef04739e5cdbd7ddd4 with SHA-1 3dd9282b is already in history

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



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