[automerger skipped] Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE am: 2274b9a64e -s ours am: 55e04f10ec -s ours

am skip reason: Merged-In I6c001e8ab8ef233c4e764d7c6753429b472dac94 with SHA-1 a40a18edcc is already in history

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

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