Merge "Adds Context Hub prebuilt xml target" into udc-dev am: a87ad610 am: 045447e7

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



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