[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: 4211ceb3 -s ours

am skip reason: subject contains skip directive

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



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