[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: 8e78d743 -s ours am: 62f2ca3e -s ours

am skip reason: Change-Id I4ff2a8d46f3fc5d06a29829a69a27a0c15e466f8 with SHA-1 7a9b7fc3 is in history

Change-Id: Icbbc9873b50df8d8ac8d9d75f03638b089476963