[automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED...

[automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 6364c19f am: 03c5ad39 -s ours am: 5046c205 -s ours am: 8c12bb27 -s ours

am skip reason: Change-Id I762fbe81329858c9057270fadf10713a9029d6da with SHA-1 ba4fb177 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I767583cffcbff8109c9ebeefa1bbbc8518b71b36