[automerger skipped] Merge "DCT unmetered 5G logic is triggered by...

[automerger skipped] Merge "DCT unmetered 5G logic is triggered by subscription override" into rvc-qpr-dev-plus-aosp am: 82807c51 -s ours am: a113e723 -s ours

am skip reason: Change-Id I8148850ea80d5a05c9e9b4b7de3c2b2b87131c14 with SHA-1 072959f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1f7d2174affdc7d34fd1179ab17d5a9689d8517