Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b41 am: 77de09efd5 am: 0979fa6cf1

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

Change-Id: I9e9f2b08dc0525b4f3330625bb700ee55b7ad7a0