[automerger skipped] RESTRICT AUTOMERGE: Fix security bug am: 01f9863464 -s ours am: d07402fc46 am: 431955c576 -s ours am: 9e8311faec am: 065384e43c

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

Change-Id: Ibd5ca0041f097ad3f5abc2a8155ddcdd1147e03d