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

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

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

Change-Id: Ic8f044e5b304d829ed3a5d1e61b00661ff94b69d