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