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

Change-Id: I88a42005d35187447ca5a8774e67356adcee02b7