[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: 1a8d5b5a -s ours
am: f672316d -s ours
am skip reason: subject contains skip directive
Change-Id: I772665e0f414edba2dcf93ba563a132f125f6582