[automerger skipped] Merge "Support carrier privileges linger period in CarrierPrivilegesTracker" am: a236a123 am: f484543d am: da282ae6 -s ours

am skip reason: Merged-In Ic225eebb6286654b431c8eb1b533a524b0a2b34f with SHA-1 1166a041 is already in history

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

Change-Id: I5fff803fcfa76a202340d9cb4860a42ec15ff13a