[automerger skipped] Merge "BluetoothHearingAid#getHiSyncId now consistently...

[automerger skipped] Merge "BluetoothHearingAid#getHiSyncId now consistently uses the term HiSyncId (removed all references to CustomerId) and added link to explain what the HiSyncId represents" into rvc-dev am: 8f8d351b -s ours am: 265a3a02 -s ours

am skip reason: Change-Id I4ff2a8d46f3fc5d06a29829a69a27a0c15e466f8 with SHA-1 3c7e8444 is in history

Change-Id: Icbbc9873b50df8d8ac8d9d75f03638b089476963