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

* commit '035383155ab8ed04a9d948875515720bbc953c0a':
  Fix MediaControllerCompat.dispatchKeyEvent() crash <API21