[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 am: 9568a669 am: 168ef63a am: c8ed359e -s ours

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

Change-Id: If821b9ebbcec12b4b36258208bd84fe2d6c951ff