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

Change-Id: Ib0fcc0592a57be6bce184b729f1c25ee02595062