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

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

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

Change-Id: I9105cd250812118609f36cf8e4af9922bef04bd4