Merge "Merge "Merge "Don't GATT Connect to BT-Classic device" into oreo-mr1-cts-dev am: c2f81495ab" into pie-cts-dev am: cc02133283" am: 58a098ad8e am: 1077331e99
am: cc256daa44

Change-Id: I749a5f843ddd386084807bd5d91341b665b6cfcb