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

Change-Id: I575c15f52bb84bdd31f6e3ddaa65794123bafb63