[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: 93a880ee -s ours
am: 1e541daf -s ours
am skip reason: subject contains skip directive
Change-Id: I5a1d261798340ae2d497258b3485031333befe7f