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