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

Change-Id: Icb817e909ee7f66f8b8f53c8e3572354845167a9