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

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

Change-Id: Ifd2317234e4e02ccd919d116dfb9f76aa14661f0