[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: 50ad5def -s ours am: 73020a6f -s ours am: af37ec88 -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: I0732040f4fc9747fe0b5a98ceb9b1a733db0926f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>