dd3f305bb3
This reverts commit 1c8188f2b40cad3dcefdcc3b7e308451bd705180. Test: atest android.media.cts.MediaRouterTest Change-Id: I1de6fbeb81b1d5ef0ec4b73173b6525d4c6edc07