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: 988f1d73" into udc-d1-dev-plus-aosp am: 1f95d70d

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



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