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

Change-Id: I2e1fe0367a3fe06110cf28c297422cfe07c374c8