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

Change-Id: I4de9857958f30cfa251da56d20c07fcca8973d95