Merge "wifi: Update API java to match new design" into rvc-dev am: 082e46d619 am: 48b68797e9

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

Change-Id: I51eaae9ff8f2a29d5c0a5036774d017047a33485
tree: 1e0fb5614c48a384ca99ab229559416cb97febd0
  1. framework/
  2. OsuLogin/
  3. OWNERS