[automerger skipped] Merge "[DO NOT MERGE]Revert "Flip...

[automerger skipped] Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b am: a88ba4ea am: 693bcf5a am: c9e079be -s ours

am skip reason: subject contains skip directive

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

Change-Id: I32de1c8178b2718249934be9ac4c2f8d1541ed27