[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am:...

[automerger skipped] Merge TP1A.220905.004 to aosp-master - DO NOT MERGE am: 6f4e679b -s ours am: 3f18321b -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: Ia58e86086613c98c2db0a2ce59364a4c8a4e310f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>