Merge "Removed non-API usage of subscription service" am: ca0cf1f129 am: 11fa093b9a am: eb302ac4c2

Original change: https://android-review.googlesource.com/c/platform/packages/services/AlternativeNetworkAccess/+/2160279

Change-Id: Ida0eb5f544dbcfed3be90557a84821b8eea4054e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>