Merge "Update keyguard charging text to indicate wireless"