Merge "MediaRouterService binds services when necessary" am: 2f9749cd57 am: e9d6a427fe am: 6d901c94f6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552155

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iffd921a94af043fb3965083f3e227de12c8d92f6