Merge "Canonicalize notification channel sounds for backup am: 2d7a4a3f67 am: 4229c3fcbd"