[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: a5a242d6 am: 2f6fcba9 am: 348d5ec6 -s ours

am skip reason: subject contains skip directive

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



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