Merge "Add CTS for MediaController.Callback" into lollipop-cts-dev