Merge "Fix doc references to "android.backup" to the new "android.app.backup""