Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS."" into rvc-dev am: 75bda7880b

Change-Id: Ieedd597b2465f7860fb0f323b869b7d73fce642b