Merge "Revert "Revert "AudioAttributes: remove static getVolumeControlStream method""" into oc-dev
am: ac7f215124

Change-Id: I9dd175f1f457293369e01ad43791622329103cd9