Merge "MediaStoreUiTest: Scan jpg instead of txt" into stage-aosp-pi-cts-dev