[automerger skipped] Merge "Fix bug that setOperatorBrandOverride applies on...

[automerger skipped] Merge "Fix bug that setOperatorBrandOverride applies on wrong subId." am: d2fcaf61 am: ebd65659 -s ours

am skip reason: Change-Id Iae42e60d3f1c4eb7e371567cd868c1d83a7e2202 with SHA-1 b4723375 is in history

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

Change-Id: I9eec882bf8f5d6f0a4277cfe295d4e0ecd6b2f2b