[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

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

Change-Id: I4181eff52c09fd302c8efd3a6dc1d98f8c11a1cd