[automerger skipped] [DO NOT MERGE] Turn off carrier privileges grace period...

[automerger skipped] [DO NOT MERGE] Turn off carrier privileges grace period feature am: ad8a3324 am: 822f814e am: a69fb480 am: 5f857a8c -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18437664



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