Merge changes from topic "am-cef86f09-a9c6-4d0b-b47d-49dc32436cc3" into q-keystone-qcom-dev

* changes:
  [automerger skipped] Opp:  Bt device picker launch issue skipped: bc86709f5f
  Opp:  Bt device picker launch issue