Merge "Allow provisioning package to retrieve subGrp, clear it's own config" am: 1428215bee am: 6b6f825b26

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

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