[automerger skipped] Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #7. am: 3b6145587f am: b3feda1db8 -s ours

am skip reason: Change-Id I413ccf8c31de6525a737c8336a904456fdbeb9e1 with SHA-1 8bf78650b2 is in history

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

Change-Id: I86df0e71fd694003dc30fd5bd3d0055d53012294