Fix and expand media scanner tests.

Fix failing testMediaScanner() and testMediaScannerNotification() tests,
and add a new test for media provider canonicalization

b/10130785
b/10667699

Change-Id: Ic9d057ecc543267489713bdcadf24889e296c353
2 files changed