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

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

Change-Id: Icb7da08d621a115bd098cf9384ebd72e2bbfdcc0