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

Change-Id: I9f9df695df7555ea67cf4ca371528b9246d70dff