am 5adf372c: am 4aeb538d: Merge "Add CTS for MediaSession.setActive()" into lollipop-cts-dev

* commit '5adf372c2a8b0104d22512589446a3ce06845f51':
  Add CTS for MediaSession.setActive()