[automerger skipped] Merge "AVRCP Controller test resource files" am: 1a252a38
am: a771790b -s ours
am skip reason: change_id Ia6f167bd0074e5d32a88b8e77537a5ea94a59104 with SHA1 f0d2f5e3 is in history
Change-Id: Iffdace817ce548d55386b46c1a8079325b6ef9ca