Merge "Update keyguard charging text to indicate wireless" into pi-dev
am: 06cfb175bd

Change-Id: Ia474165d912c2090f4756108124c8a0333b31e6b