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