Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14993471

Change-Id: I0f8b1a947ca6e738bc21ee2c49e2412b2f99997d