[automerger skipped] RESTRICT AUTOMERGE: Fix security bug am: 01f9863464 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1b01642c20c96c5bc9cd32d867bb1c338ca13d8f