[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 1ea706ef47 -s ours am: 525ca621af -s ours am: edf7774ebf -s ours am: acf9c8ee6a -s ours

am skip reason: Merged-In I424f45bc30ea8e56e4c4493203ee0749eabf239c with SHA-1 1ff38ab351 is already in history

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

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