Merge "Update wirelessly charging text on lockscreen" into qt-dev
am: b99646c3a3

Change-Id: Ib89f1ac737f6573a584f472ed8b138381d692ac5