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