Merge "Add prebuilt_etc for consumerir feature xml" into main am: fe0c71f1...

Merge "Add prebuilt_etc for consumerir feature xml" into main am: fe0c71f1 am: fe0739ea am: 10656c42

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



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