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

Change-Id: Ia6401c00fd45af97ca7fa82f432946e15e09ec1d