Change secure setting that controls skipping of user-facing packages

Bug: 159648065
Test: N/A

Change the setting key to be 'backup_skip_user_facing_packages'. See the
bug for context.

Change-Id: I315141a509976821c7db311544a5c0f4e6fd1917

services/backup/java/com/android/server/backup/UserBackupManagerService.java

@@ -318,7 +318,7 @@ public synchronized void quit() {
 
     private static final String SERIAL_ID_FILE = "serial_id";
 
-    private static final String SKIP_USER_FACING_DATA = "backup_skip_user_facing_data";
+    private static final String SKIP_USER_FACING_PACKAGES = "backup_skip_user_facing_packages";
     private static final String WALLPAPER_PACKAGE = "com.android.wallpaperbackup";
 
     private final @UserIdInt int mUserId;
@@ -3557,7 +3557,7 @@ public void selectBackupTransportAsync(
     }
 
     /**
-     * We want to skip backup/restore of certain packages if 'backup_skip_user_facing_data' is
+     * We want to skip backup/restore of certain packages if 'backup_skip_user_facing_packages' is
      * set to true in secure settings. See b/153940088 for details.
      *
      * TODO(b/154822946): Remove this logic in the next release.
@@ -3581,7 +3581,7 @@ public List<PackageInfo> filterUserFacingPackages(List<PackageInfo> packages) {
 
     @VisibleForTesting
     public boolean shouldSkipUserFacingData() {
-        return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_DATA,
+        return Settings.Secure.getInt(mContext.getContentResolver(), SKIP_USER_FACING_PACKAGES,
                 /* def */ 0) != 0;
     }