Merge "Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874a am: aaa43119" into oc-mr1-dev-plus-aosp