Merge "Expose grouping and opportunistic carrier config keys." am: 293c5ebb47 am: 761c8c15ad am: b0032d8231

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

Change-Id: I726511556c42d3943213baa761248348cdae651f