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

Change-Id: Ie7db98466cb6ff441366b75c2a7c2b51833d387f