[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Use separate...

[automerger skipped] Merge "Revert "DO NOT MERGE Hearing Aid: Use separate time for L/R in connect() and use whitelist""
am: 123d59a7 -s ours
am skip reason: subject contains skip directive

Change-Id: I20f008f7a699c7f21ed6f0b681865b14802ca586