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

Change-Id: I3806838a0cd2e4ebe6bdf27fafcd22afe177bb22