Merge "Remove "Couldn't pair" prompt on ACTION_PAIRING_CANCEL am: 61ad5ae921 am: 39a9832df1" into oc-mr1-dev-plus-aosp