Merge "Change Wifi Picker icons to colorControlNormal." into oc-dev
am: 8680e8fc78

Change-Id: I6d315a98637b188615c81d558fd8d910d3fb6762