Merge changes from topic "bt-avrcp-controller-cover-art" am: 773a98c249 am: 174be8ea30

Change-Id: Id8114fb2c3a275f406d2de3555f9836453d73f23