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

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



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