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: bb1ccc30 am: a2b38bcd" into rvc-qpr-dev-plus-aosp am: e9a4a92c

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

Change-Id: I1ee4b32d5e1e051db7f8f066074afe8b84d95934