[automerger skipped] Fix transaction sanitization am: f1ad68a1 -s ours am: fd9d1096 -s ours

am skip reason: Merged-In I53894d014bfabc9c958a6f533d7e3b3a6dcd0a34 with SHA-1 2fc9515b is already in history

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



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