Merge "Fix remote volume adjustment for Android U"