Merge "Fix battery content description when there is no percent mode" into qt-dev am: 4f3e0aa4d3
am: aa4c25ed75

Change-Id: I5143949e6e25043101c2c515355f0101d455a984