Merge "Merge "wifi: Update API java to match new design" into rvc-dev am: f9836b01 am: c051e68c am: c06d78a3" into rvc-qpr-dev-plus-aosp am: 49b696f1

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

Change-Id: I735315759d3c61b32c709bba23a37f0935a6c76d