Merge "Merge "Remove Wifi Badges from platform." into oc-dev am: 09d06437ad am: 216f596cee" into oc-dr1-dev-plus-aosp
am: f10bf2902d

Change-Id: I33161b617d1951dd70877bfdafd08d6f1dbf9a2f