Merge "Fix truncated string in battery saver notification" into rvc-dev am: 1d650a22fb am: 0303e6ae7c am: 317a0ccd15

Change-Id: I7ed6558e7142fc13b3d3039f493a629eb6283ebb