[automerger skipped] Fix transaction sanitization am: 2fc9515b -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/+/27360353



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