Merge "Light grey android.media.MediaScanner.isNoMediaPath" into pi-dev
am: a8527b9cb1

Change-Id: Iec693237e0c9d9532c0a2f5eeb5691578c27a1bf