Merge "wifi: Update API java to match new design" into rvc-dev am: f9836b0186

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

Change-Id: Ic95b01c078de823bfc5ca2f78e9d3ae8fbc4872f