Merge "Merge "Fix bug that setOperatorBrandOverride applies on wrong subId." into rvc-dev am: c7529994 am: eecafacc am: d629e9d7" into rvc-qpr-dev-plus-aosp am: f9f956e9

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

Change-Id: I25d17817ed7508d94b5d150a1be442e66d742e54