Merge "Merge "Bluetooth LE Connection Priority test refactor" into oreo-cts-dev am: ffb9d29657" into oreo-mr1-cts-dev