[automerger skipped] Faster bugreports (2/n) am: 1c855127 am: a9a4d896 am:...

[automerger skipped] Faster bugreports (2/n) am: 1c855127 am: a9a4d896 am: 1c59181e am: 4bd00bb9 -s ours

am skip reason: Change-Id I2185cc3e2f429a150605d6268324c52d137db385 with SHA-1 5377d797 is in history

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

Change-Id: I6b26d77094b29d9d6feaaaa74a9ba9726d913665