Fix artist to album link on Q devices

In Q a bug in MediaStore is fixed where artist to album mapping
was keyed with _id column rather than album_id. This changes so
we prefer the album_id column but resort to _id if not found.

Bug: 128918172
Test: Manual test on P & Q devices
Change-Id: If01eb7b3d64160eb3d08c3e61f36097a9576c397
1 file changed