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

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



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