am c50d2847: am ccde590a: Merge "Add more CTS for MediaController" into lollipop-cts-dev

* commit 'c50d284722aa87a7476e5875c435656c9a5593dc':
  Add more CTS for MediaController