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

Merge "wifi: fix incorrect java doc" into rvc-dev am: 1933391c am: bb1ccc30 am: d05e1d45 am: 95f32b11

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

Change-Id: Ia005f84e1c7cdcf73e6fbe12b65dc2cf92328caa