[automerger skipped] Fix transaction sanitization am: 4e916b04 -s ours

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

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



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