Merge "b/6232528 Reduce volume persist delay to 500ms" into ics-aah