Merge "Remove WifiApiServiceInfo" am: 906fe717a0

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

Change-Id: Ib7b865dadb486096af32ebf4e634bad07e813fa5