Merge "DO NOT MERGE) MediaRouter: Handle NoSuchMethodError at MediaRouterJellybeanMr1" into mnc-ub-dev
am: b226209225  -s ours

* commit 'b226209225a2d27836d8a01de5dc41740f4d2122':
  DO NOT MERGE) MediaRouter: Handle NoSuchMethodError at MediaRouterJellybeanMr1