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

Change-Id: I4ef4ea53296d0c5223c58277e854d9950455936a