[automerger skipped] Merge "Allow TEMP_NOT_METERED on 5G SA network" am:...

[automerger skipped] Merge "Allow TEMP_NOT_METERED on 5G SA network" am: abc1ec21 am: 6be17fa4 -s ours am: 79f96333 -s ours

am skip reason: Change-Id I750e8c271ca086d260d783f66fc0f8481bf31dd2 with SHA-1 37abe12b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6877a4f07b6728ed090df1956d668b77ce9b357