[automerger skipped] Merge changes from topic "5g_tempnotmetered" am:...

[automerger skipped] Merge changes from topic "5g_tempnotmetered" am: c99581db am: f7f3d12f am: 5d92d578 -s ours

am skip reason: Change-Id I50d3dabffe5e62f56c5958afe8adb194444594a6 with SHA-1 7be8461f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6ebcc0637611260d2d45d5c243c134fd9b388e2