[automerger skipped] [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace...

[automerger skipped] [DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d am: 597690dc am: 30395da5 am: 3133391c -s ours

am skip reason: subject contains skip directive

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



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