[automerger skipped] Fix transaction sanitization am: 07abf839 -s ours

am skip reason: Merged-In I53894d014bfabc9c958a6f533d7e3b3a6dcd0a34 with SHA-1 04e41761 is already in history

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



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