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

Change-Id: I30f8e10c9f240b648dae695b8a7c859fb754fe00