[automerger skipped] Fix transaction sanitization am: f1ad68a1 am:...

[automerger skipped] Fix transaction sanitization am: f1ad68a1 am: 1a160d9f -s ours am: 00067a8e -s ours

am skip reason: Merged-In I53894d014bfabc9c958a6f533d7e3b3a6dcd0a34 with SHA-1 07abf839 is already in history

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



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