[automerger skipped] Merge "[DO NOT MERGE] Revert "Remove VCN Carrier...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Remove VCN Carrier Privilege grace period"" into tm-dev am: 715e1118 am: 076a9e61 am: c08e893b am: dfc0d001 -s ours

am skip reason: subject contains skip directive

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



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