Merge "Make EnabledNetworkModePreferenceController listen to setting changes" into qt-r1-dev am: 66208e734b
am: 9e58a8df39

Change-Id: Ie592b8f8639d1a29b1eb26f9979b55e1a895b02e