Merge "MediaRouter: Update discovery request for unregister" into rvc-dev am: 5f971a2584

Change-Id: I22c9d80e62dacb830ee4cde7e7623c21787c6978