[automerger skipped] Merge "Fix Connect State message in Device details for Hearing Aids" into pi-dev am: 31703ca227  -s ours
am: 0eb58d6f55  -s ours

Change-Id: I8c89ec79c91605b43a073dbbe225b828bd2fdd35