Merge changes from topic "am-68724411-6a33-4f7d-98e8-f46d71e6ed7f" into q-keystone-qcom-dev

* changes:
  [automerger skipped] AVRCP_BROWSE: Inserting check for externalPath length skipped: aba58499aa
  AVRCP_BROWSE: Inserting check for externalPath length