Merge "Fix NPE in MediaRouterService" into oc-dr1-dev am: bba60fadc7
am: 5a3d561e2d

Change-Id: Ie2f4ccb46e0de6b177ff1f13ecc95fa7cabb04f9