Merge "Add prebuilt_etc for consumerir feature xml" into main am: fe0c71f1e2 am: fe0739eaa2 am: 10656c4238 am: 9f3b4a57f6 am: 98465ed0ea

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

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