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

Change-Id: Ib78a39b0c0d5cbb2cd1082257eed8a2ba799bddd