Merge "MediaSessionService: Prevent getActiveSessions() from growing infinitely" into oc-mr1-dev am: 9bc71c4922
am: 3fabcdb45a

Change-Id: I84e5c9339250ed79e8cfdfefd9baddd2ceba3a78