[automerger skipped] Merge "Update API to include various bug fixes in metalava" into udc-mainline-prod am: 510fb0e053 -s ours

am skip reason: Merged-In I35435378f06591be754d8d05f48c9b80f8efaf65 with SHA-1 201e81ae28 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/25454096

Change-Id: I291a549b2767f97fdabd4b3262e96605c5cc98a0
Signed-off-by: Automerger Merge Worker <[email protected]>