Merge "Merge "Add testing for new carrier-associated app behaviors." into...

Merge "Merge "Add testing for new carrier-associated app behaviors." into rvc-dev am: c84c4692 am: d54c961f am: e0249e57" into rvc-qpr-dev-plus-aosp am: c5a9edd7

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

Change-Id: I1815fee3bfd667d34ef15d23dd63233037adc6b8