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

Change-Id: Icaa20e177b9037291b4c9fc03466b692618e95e8