[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am:...

[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period" am: 3a8a004d am: 597690dc am: 30395da5

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



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