Merge "Add refresh broadcast id checks" into tm-dev am: cd2d6f3e am: fa7b40c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18352143



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