Merge "wifi: Update API java to match new design" into rvc-dev am: f9836b01 am: ad91817d am: 4a603299

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

Change-Id: Idf170215f701a8df7660658b357980c00f9586e7