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

Change-Id: I86392485b8583d96d15610b1e7ee6cf123b83791