am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev

* commit 'af468addb672ef002dee64376bc06f2bf8c6c0f9':
  Add Null checks while processing pairing cancel intent