am af2e45e1: am 41bfb1aa: am 1acec5e3: am 370df7e1: am 6f810d46: Merge "Add CTS-verifier test to test cross profile media capture." into lollipop-cts-dev

* commit 'af2e45e1205f12cfe5cfbf7df5b9937391c3e3b7':