[automerger skipped] Merge "Adds Context Hub prebuilt xml target" into main...

[automerger skipped] Merge "Adds Context Hub prebuilt xml target" into main am: ba1f9d67 -s ours am: 84deea75 -s ours am: 0207ad24 -s ours

am skip reason: Merged-In I20424880e76d75fad3fb1dda7249d7ec4c1d2d20 with SHA-1 8e04e768 is already in history

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



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