[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: a23b1628 am: 9759967f -s ours

am skip reason: subject contains skip directive

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



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