[automerger skipped] RESTRICT AUTOMERGE: Fix security bug am: 01f98634 -s...

[automerger skipped] RESTRICT AUTOMERGE: Fix security bug am: 01f98634 -s ours am: d07402fc am: 431955c5 -s ours am: 9e8311fa am: 994cb6c5 am: aa67a4c8 am: 97437cc7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4c6e63d405f74b058082f12ea6e4615f680b2c99