Merge "Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev am: dfb06b85 am: 51006675" into rvc-d1-dev-plus-aosp