[DO NOT MERGE] Turn off carrier privileges grace period feature am: ad8a3324...

[DO NOT MERGE] Turn off carrier privileges grace period feature am: ad8a3324 am: 279dafa8 am: 00cedf53

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



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