[automerger skipped] Mitigate the security vulnerability by sanitizing the transaction flags. am: 03d4458ea0 am: eecb9da535 -s ours am: 353274b15c -s ours am: c907314332 -s ours am: fd8f137133 -s ours am: 578dfd98c9 -s ours

am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 3ea58dbc1d is already in history

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

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