Merge changes from topic "bt-fix-phone-policy-limit-retry"

* changes:
  PhonePolicy: Retry HFP and A2DP once only
  PhonePolicy: Logging and logic refactor