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

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

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