[automerger skipped] Faster bugreports (3/n) am: 4875aa6b am: 8b193f40 am:...

[automerger skipped] Faster bugreports (3/n) am: 4875aa6b am: 8b193f40 am: 751e681a am: 8223891e -s ours

am skip reason: Change-Id Iea3a6e676f05149a3f2cfc1fcd475c70ea253d08 with SHA-1 3c2fdbd8 is in history

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

Change-Id: Id546c059f3615ec87484f5df312802e2630d726a