Merge "Fix  BLE Secure/Insecure for chipsets where ble multi adv is not supported" into oreo-cts-dev
am: 2870c1bd78

Change-Id: I727c8ce9981a16f4e213bc8946db445e54a9ab03