Merge "Create a unique key for each SERVICE_STATE broadcast variant." into udc-dev am: 0415e697

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



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