am 34e942c2: am cd7f02ff: am 3b379f3b: am ea3949a0: am 72e627f9: Merge "Add CTS for MediaBrowser.MediaItem" into lollipop-cts-dev automerge: 6585d2a

* commit '34e942c2abd5cc228708fb5ecd9c10fb67f230c3':