Merge "Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #4."" into rvc-dev am: dfb06b85 am: dd869405 am: 2dad6752" into rvc-qpr-dev-plus-aosp