[automerger skipped] Merge "Mitigate the security vulnerability by sanitizing...

[automerger skipped] Merge "Mitigate the security vulnerability by sanitizing the transaction flags." into tm-dev am: 52a0d7cb am: 48e16201 -s ours

am skip reason: Merged-In Id9d9012d4ede9c8330f0ce1096bcb78e51b7c5df with SHA-1 6bb12824 is already in history

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



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