[automerger skipped] Merge "Handling of incoming AVRCP Controller connections" into qt-dev
am: 22426cae -s ours
am skip reason: change_id I15abd2fd4bc963889d6cdfe9364a651e2b4c3c10 with SHA1 c903ad8f is in history
Change-Id: I0586d4d5cc16d8581693c6c6a64298dbb195d550