Merge "CDD: Require full-disk encryption to be on by default" into mnc-dev