Merge "Fix MediaControllerCompat.dispatchKeyEvent() crash <API21" into lmp-mr1-ub-dev