Merge "Add prebuilt_etc for consumerir feature xml" into main am: fe0c71f1e2 am: fe0739eaa2

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

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