[automerger skipped] Merge "Mitigate the security vulnerability by sanitizing the transaction flags." into tm-dev am: 52a0d7cbb6 am: 0776ea95b6 am: 356d2354c3 am: f891e48d44 -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/+/20681289

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