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

Change-Id: If64be99b71d19a95fb7695252799321d1d126f15