Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev am: 3d61c82b

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

Change-Id: Iab49a5f76886f6fad427c6a3125da1c725b2fdbd