[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 7089b35a -s...

[automerger skipped] DO NOT MERGE - Merge TP1A.220624.021.A1 am: 7089b35a -s ours am: 8d983d35 -s ours am: 07c2d1a8 -s ours am: 9da0cf47 -s ours

am skip reason: subject contains skip directive

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



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