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

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

Change-Id: I7f5d1880ab0e641f22ba7d8d13406de319505833