Merge "Define android.software.credentials.xml as prebuilt_etc" into main