Merge "Make apex availability of framework-wifi-util-lib explicit" into main am: 6298a2b92a am: ae30ca8604 am: 1d7063f0ca

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

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