Merge "Apply delivery group policies to SERVICE_STATE broadcast." into udc-dev am: 81048dfd

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



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