[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: 284acc19 -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: I26dd7f08c3c7e86fa89e60b5f7d52a85e45482d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>