Merge "Add carrier configuration for list of opportunistic carrier-ids  associated with CBRS pSIM" am: 325b64ce57 am: 86d7800268 am: 735988b544

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1913132

Change-Id: I456d98f40eb2a8d741da52594ef73b50f4bb578d