Merge "Make service-connectivity APEX-only" into sc-dev am: 1bec64d1cb

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

Change-Id: I68f65727424d4b9511cdfc258ac97804baa51be1