[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: 8e8cb1af am: fd6e4983 -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: I4c22f826e9b24e1264a6518f12fefdabf189c5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>