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

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



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