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

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

Change-Id: I34424a88be40eb92166f1b23f0e5403bb9c1dccc