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

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



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