am 2c173d4e: Merge "Add MediaSession support to MediaRouter support lib" into lmp-dev

* commit '2c173d4e6a5a5f9650cd7ba416cdaba4f99d3784':
  Add MediaSession support to MediaRouter support lib