[automerger skipped] Merge "Merge TQ1A.230205.002" am: b5e5e128 -s ours am:...

[automerger skipped] Merge "Merge TQ1A.230205.002" am: b5e5e128 -s ours am: 44a7e1dc -s ours am: 42d8c73e -s ours

am skip reason: Merged-In I96a738dcb01bf1c9e2792d3fee547c147dba33b5 with SHA-1 69d75577 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2424785



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