Merge "Allow provisioning package to retrieve subGrp, clear it's own config" am: 1428215b am: 6b6f825b am: 4a6b279b am: 0ae3528d am: 5a2cffa0 am: b04ad927

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



Change-Id: Id1aa5bbcc504620334fce2da0744d1f726a46d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>