Merge "Vol key presses: active stream has priority of set control stream" into oc-dev am: 031cf14582
am: 3d29751790

Change-Id: I5a686ceb2be219bf6a1c3f26012ff0c97c2652e9