Merge "Add @IntDef for flags sent along with volume change" into sc-dev