am fea2508f: am d4f9511d: am e8603c1e: am b5166b1d: am 71a8a6d7: Merge "Add CTS for MediaBrowser" into lollipop-cts-dev

* commit 'fea2508fef874cfce67af4a7444ebb5e495104d0':