Merge "Rename priority to connection policy in bluetooth apis" am: 98c91be8ae am: a115281a2d

Change-Id: I243cf844883e088f82613a97fe061468bc126cdb