Merge "Fix the finding logic of MediaButtonSession" into oc-dev am: 9cfd30202d
am: 3997797998

Change-Id: I7663e1a9755eaa79eecd3d6c808047349aa72b36