[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: 77de09ef am: 7ac99ba8 am: dfe55a14 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I443cba28eb1a53358032dc6dfbc23aea2d024ae4