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

Change-Id: Idec0c249bd216cbda493731ecf03e9db7eefb216