Merge "Add carrier configurations for Opportunistic SIM Activation" am: 49020459ed am: d08620c4c8 am: f61cd72f58 am: f5cf4e80bb

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

Change-Id: I4e60ac18293e6869832b86b4d370070fc403ce0b