Merge "Deprecate android.support.v4.media.Transport* classes" into nyc-support-25.3-dev