Snap for 7587820 from 5f52f6464aea81d744e156751bf6d450ee1adfe3 to tm-release

Change-Id: I2c180e8a6a38806668331aca6330ce5df2d31ba4
diff --git a/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java b/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
index 3db420d..91b19b2 100644
--- a/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
+++ b/prebuilts/gradle/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
@@ -57,7 +57,7 @@
         sUriMatcher.addURI(ImageContract.AUTHORITY, "images/#", IMAGE_ID);
     }
 
-    // Indicated how many same images are going to be written as dummy images
+    // Indicated how many same images are going to be written as unused images
     private static final int REPEAT_COUNT_WRITE_FILES = 10;
 
     private File mBaseDir;
@@ -71,7 +71,7 @@
             return false;
         }
         mBaseDir = context.getFilesDir();
-        writeDummyFilesToStorage(context);
+        writeUnusedFilesToStorage(context);
 
         return true;
     }
@@ -185,10 +185,10 @@
 
     /**
      * Preload sample files packaged in the apk into the internal storage directory.  This is a
-     * dummy function specific to this demo.  The MyCloud mock cloud service doesn't actually
+     * function specific to this demo.  The MyCloud mock cloud service doesn't actually
      * have a backend, so it simulates by reading content from the device's internal storage.
      */
-    private void writeDummyFilesToStorage(Context context) {
+    private void writeUnusedFilesToStorage(Context context) {
         if (mBaseDir.list().length > 0) {
             return;
         }
@@ -202,7 +202,7 @@
     }
 
     /**
-     * Write a file to internal storage.  Used to set up our dummy "cloud server".
+     * Write a file to internal storage.  Used to set up our mock "cloud server".
      *
      * @param context   the Context
      * @param resId     the resource ID of the file to write to internal storage
diff --git a/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java b/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
index 37db139..6b47561 100644
--- a/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
+++ b/prebuilts/gradle/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
@@ -42,7 +42,7 @@
  * Contacts permissions (({@link android.Manifest.permission#READ_CONTACTS} and ({@link
  * android.Manifest.permission#WRITE_CONTACTS})) are requested when the 'Show and Add Contacts'
  * button is
- * clicked to display the first contact in the contacts database and to add a dummy contact
+ * clicked to display the first contact in the contacts database and to add a fake contact
  * directly to it. Permissions are verified and requested through compat helpers in the support v4
  * library, in this Activity using {@link ActivityCompat}.
  * First, permissions are checked if they have already been granted through {@link