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