Merge "Use Wi-Fi content description in StatusBarWifiView" into pi-dev
am: 057698e511

Change-Id: Ibe278a8d5830b7345de40feda17390e09d3dab20