[automerger skipped] Merge changes Id01e6771,I7e53a8a2 am: 5f67e759 -s ours...

[automerger skipped] Merge changes Id01e6771,I7e53a8a2 am: 5f67e759 -s ours am: add26de1 -s ours am: 191dd2d2 -s ours am: ab54f25e -s ours am: 8de87415 -s ours

am skip reason: Merged-In Id01e677175a2cf98f4d893e21f3c654375772153 with SHA-1 a9e06fd4 is already in history

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

Change-Id: Icd4822488e15c98765693d07cde7fa1ec7ec8699