Merge "Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c am:...

Merge "Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c am: 197b9f52" into rvc-d1-dev-plus-aosp am: 84e1dded

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

Change-Id: Ib461d9f70810adfc76725de5f97ab4c03dd33eb1