Merge "Use the same fixed channel allocator for both Classic and LE...
Merge "Use the same fixed channel allocator for both Classic and LE connections" am: 1e8afd83 am: 4c0bd612 am: 30366591
am: accfcccf
Change-Id: I8112de35283c720bf74efe851ca3e8b22f6f0ddb