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

Change-Id: I02aee5c787bb0f8b65d433c3133db063a7d6f93d