Merge "MediaSessionCompat: Use Media Button Component on API 21+" into lmp-mr1-ub-dev