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

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

Change-Id: I5285925bb90b3b9923b97bd38a5049399c59b691