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

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

Change-Id: Iae5206db5b332d666d1ba3783a26f1d68d7f1640