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

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

Change-Id: I6208f9e520c30a7d3091a02573ded7762578c261