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

Change-Id: Ie118237fa04ac462daefdbee8515cf5a15780a28