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

Change-Id: I8062e205af16792aa5ae0593795a940fc75813bc