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: I4178e0e7360622566e59e6f21521b0559921055f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>