Merge "Fix result mismatch in broadcast radio service" into udc-dev am: 2edc38cc

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



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