Merge "remove activation button from preferred NW setting" am: 956e8707df am: 931ab9ddad
am: 92d0c3bb40

Change-Id: I4992df4d1bbac7e3b2c02bef29f5ed20c3ed6b52