[automerger skipped] Make EnabledNetworkModePreferenceController listen to...
[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am: aa88b8ce -s ours
am: 0f1b14e4 -s ours
am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA1 6d910e86 is in history
Change-Id: Ic86a69026cb7db7049519aae4ee0367a13cf4c9a