Merge "Using CF_ACTION_REGISTRATION instead of CF_ACTION_ENABLE" into sc-qpr1-dev am: d7f7bdf620

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/15532474

Change-Id: I6816b7017a51e0f0c341ff159a643e7e9fa899a3