Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into...

Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e1118

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



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