Merge "Remove WifiApiServiceInfo" am: 906fe717a0 am: b0b08331f4

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

Change-Id: Ieb26b8063828cf6a9d971d06987c27d064004f15