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

Change-Id: I5e5bf9939b7fbfdb26ad07ab4ef22ada92e23a8a