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

Merge "Define android.software.credentials.xml as prebuilt_etc" into main am: c9e99f79 am: b41e320f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3152117



Change-Id: I5ab921bd4233acf2176960f48376283ab6ebd618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>