Bug: 147646634 Test: make update-api -j; atest mediaroutertest Change-Id: Ia0278af6a2b62fa90e61bb278772c6369c62481d