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

Change-Id: I28dbb73021ea5bfeec3fda3e35849ad446d65102