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

Change-Id: I19092d4023ee5f72d13cb479c82143d2b99be65d