Merge "Fix NPE in MediaRouterService" into oc-mr1-dev
am: 486b37cdac

Change-Id: Ib83b3c0560f132067727c1c9df73a2110de83030