Merge "[automerger skipped] Merge "Handling of incoming AVRCP Controller...
Merge "[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" into qt-dev-plus-aosp