Merge "vendor: Support system-as-root A-only backuptool" into android-10