[automerger skipped] Merge "RESTRICT AUTOMERGE Fix the bootloop happening due to missing permission." into sc-v2-dev am: 91da8a2976 am: cdcd630123 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib3f55af3b242bd1afa868a3d3d430f03d9e3c186