[automerger skipped] Mitigate the security vulnerability by sanitizing the transaction flags. am: 3ea58dbc1d am: 8b172cefcb am: e3ae4f39f6 -s ours am: 96742baf3a -s ours am: b982e21dba -s ours

am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 5d1b23522b is already in history

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

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