Bug: 63970300 Test: manual and passed MediaRouterTest Change-Id: I2e8d09d16ca8693b1bdf51397ad4f10c4aa6d87b (cherry picked from commit 2d36ae9d)