Merge "Improve the reliability of Bluetooth LE Connection Priority Client Test." into oreo-cts-dev
am: 4c886e2708

Change-Id: I510a4709d18c748c703d82550769039e13567588