[automerger skipped] Mitigate the security vulnerability by sanitizing the transaction flags. am: 03d4458ea0 am: eecb9da535 -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: I71386888373c6f49527569440366d2f97f00f47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>