[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: e539d7f8 am: 2644c355 am: f574fff6 -s ours

am skip reason: subject contains skip directive

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



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