Merge "Fix broadcast type value handling error" into main am: 4454e7c729

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

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