Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp * commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616': DO NOT MERGE - Updated media playback transport controls (b/3116268)
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp * commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616': DO NOT MERGE - Updated media playback transport controls (b/3116268)