[automerger skipped] Merge "Update CS so that per-app OEM APIs can be tested" into sc-dev am: 24ab50b086 -s ours am: 6b23638b99 -s ours

am skip reason: Merged-In I5a47dcece31749293f080af060218d827082eb67 with SHA-1 b7ca034306 is already in history

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

Change-Id: I798d6b12750270b9312cee54f1d019c05acc7689