[automerger skipped] Merge "Don't remove allocated player IDs when an app has...
[automerger skipped] Merge "Don't remove allocated player IDs when an app has a browse service" into rvc-dev am: 57fca22b -s ours
am skip reason: Change-Id I429b831621e188cb8312cc574d1928f0cb3bf3fd with SHA-1 bea61723 is in history
Change-Id: I1f38459aacd1fb6ae8d535a0c29c2617a5b3fd5b