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

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

Change-Id: Ib3f7efeac5c38bfe88bede50a02274c86f37b84d