Merge "adbd: strip nulls from all service strings."
am: 79f304771c

Change-Id: I406bc45d1dca88f26f1c84dd4eb85f9c26bc325d