Merge "API review: android.media.tv" into lmp-dev