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