[automerger skipped] Make EnabledNetworkModePreferenceController listen to setting changes am: aa88b8cee6
-s ours
am:0f1b14e467
-s ours am skip reason: change_id I5dfe4843a681c613f49caf4584e9dbebc54e708a with SHA16d910e8608
is in history Change-Id: Ic86a69026cb7db7049519aae4ee0367a13cf4c9a
This commit is contained in: