Merge "remove activation button from preferred NW setting"
am: 956e8707df

Change-Id: Id50e8eb4471aa5a97f7854c2189fd0dd693d49bc