Merge "Fix BluetoothRestrictionTest flakiness." into oc-dev
am: 70c775a000

Change-Id: I9a496a1137409cb93fa8e5f1b2e3c8a554b28179