[automerger skipped] RESTRICT AUTOMERGE Fix the bootloop happening due to missing permission. am: 9a2c897f am: 65fd1b2d -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ide1e49d414a2c7c2f0064bac40e167139e31a4f8