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

Change-Id: I8355652a3ddec5897ce3a3d656b9a06eb4b5630d