[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: 065384e4 am: 01d265d4 am: ae6cf8c3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9b7b3e2cad8a0b310cfc77c05ef8bdec806eca9b