[automerger skipped] Merge "Merge TQ1A.230105.002 to aosp-master - DO NOT MERGE" am: f7df86ee44 -s ours am: 8038c0ba7d -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: I8cff47e3f1a4a8f3380fd328892fd6e072139ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>