Merge "Don't remove allocated player IDs when an app has a browse service"...
Merge "Don't remove allocated player IDs when an app has a browse service" into rvc-dev am: 57fca22b am: 31f26e8c am: 406012de
Change-Id: I223ff1f9086ea0fa6bf9fc2cc56b4fb5df86262e