Merge "Don't apply default encryption to /data/user, it should get per-user encryption." into mnc-dr-dev