Merge "Fix issue that preferences of call settings cannot be disabled" am: 059205e53d am: 10cf857ac3
am: 5c2226b9c4

Change-Id: Id8a3416499788a240ca3c30aae6bea6f94e34b45