merge from open-source master

Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8

Author: The Android Open Source Project

media/java/android/media/MediaScanner.java

@@ -1215,8 +1215,12 @@ public Uri scanSingleFile(String path, String volumeName, String mimeType) {
             prescan(path);
 
             File file = new File(path);
+
+            // lastModified is in milliseconds on Files.
+            long lastModifiedSeconds = file.lastModified() / 1000;
+
             // always scan the file, so we can return the content://media Uri for existing files
-            return mClient.doScanFile(path, mimeType, file.lastModified(), file.length(), true);
+            return mClient.doScanFile(path, mimeType, lastModifiedSeconds, file.length(), true);
         } catch (RemoteException e) {
             Log.e(TAG, "RemoteException in MediaScanner.scanFile()", e);
             return null;