DO NOT MERGE - Updated media playback transport controls (b/3116268)

Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
2 files changed