[automerger skipped] Merge "package-manager: Unhide FEATURE_UWB" am:...

[automerger skipped] Merge "package-manager: Unhide FEATURE_UWB" am: 8c8901b5 am: 94950d33 am: a741c56d -s ours am: 6c1e61ac -s ours

am skip reason: Merged-In I7071385c509585349bab169797e3d6e32ab425cd with SHA-1 51c5f7ba is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644445



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