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

Change-Id: I168ae52dfa75a3344ce5b6599b83362c534e3bbf