[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b8a28532 am:...

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: b8a28532 am: eb53994e am: d7ca569c -s ours am: d77d4d88 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I48745765024d33e943e7de5135645553947d6241