Merge "API for app to know what to set in Activity.setVolumeControlStream()"