Merge "Merge "Create a unique key for each SERVICE_STATE broadcast variant."...

Merge "Merge "Create a unique key for each SERVICE_STATE broadcast variant." into udc-dev am: 0415e697 am: aa54e9c6" into udc-d1-dev-plus-aosp am: 6f12b606

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



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