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

Change-Id: I947a90d8af6c77f619edc67f0338e4580727f1d9