Merge "Show only 1 entry for hearing aid device after killing the activity." into pi-dev am: ed344d1753
am: c19f0a6649

Change-Id: I315316c0c50c94689ba80e548d554f73fa63043d