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

Change-Id: I9ca68545e70ae8b503c2b0e318aa44e71e6fdb9f