Merge "Don't GATT Connect to BT-Classic device" into oreo-mr1-cts-dev
am: c2f81495ab

Change-Id: I8ef78c7b2093777014782865e4c41f601d006191