Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev