Merge "Call preference.setEnabled only after updating disabledByAdmin state."...
Merge "Call preference.setEnabled only after updating disabledByAdmin state." into nyc-dev am: 13e22319
am: a58b0bb9
* commit 'a58b0bb9':
Call preference.setEnabled only after updating disabledByAdmin state.