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

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

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