Merge "ServiceManager APIs for Wi-Fi mainline module" am: 0ce930a02e

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

Change-Id: I2591edfe683ccab7fd482c342dc88630a9561bb4