Merge "MediaRouter: don't scanPackages if unnecessary" into rvc-dev am: ce4cd092d9 am: 500f793194

Change-Id: I31b8d3c1ed55da68f2073dce3d52149db9140ca7