Merge "Update MobileDataPreference about multi-SIM data enable logic" am: 9833acd05e
am: e532eae6db

Change-Id: I0272f79be2d20aec9e2643c459190674b6a648aa