Merge "Fix broken MediaSessionManagerHostTest" into oc-dev am: f4bdfbd986 am: 8658e66ca3
am: bbdc4da88c

Change-Id: Ie488f943f63e2041ccd43c5caa483903cfcf9462