Merge "PlaybackStateCompat: Add support for custom actions, extras, and active item id" into lmp-mr1-ub-dev