Merge "Remove unused strings android_upgrading_apk and android_upgrading_fstrim."