Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS."" into rvc-dev am: c60b0a8a70 am: 1f0f3b1e14

Change-Id: If17956381b6253d37f8e97482aaf82e1ec71a919