[automerger skipped] Merge "Fix isUnmeteredUseOnly check." am: a44a1861 am:...

[automerger skipped] Merge "Fix isUnmeteredUseOnly check." am: a44a1861 am: cf08dd92 -s ours am: 5cd6ad04 -s ours

am skip reason: Change-Id I92ae1a55dff050bc21d7d101f90fe6f4afe7ea9e with SHA-1 41077bfe is in history

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

Change-Id: I9dea2be57f1419ad7f3c7aa4b8294d171e182286