[automerger skipped] Faster bugreports (5/n) am: 6b1ea2da am: 55f771a6 am:...

[automerger skipped] Faster bugreports (5/n) am: 6b1ea2da am: 55f771a6 am: 7cc397d4 am: 6bfddbe5 -s ours

am skip reason: Change-Id I107b3de9d49309fbfa1256203bfe705ca6c7608d with SHA-1 e017f988 is in history

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

Change-Id: Ibb75d4c6b7f934c369b289282fd63cee21fac573