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

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: e92a5a2e am: 7c3ed0a8 am: 94fe8636 -s ours am: 160b766e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I38ff3fc5bf12b9b84af25a3ec8a33e85cbebdafa