Merge "Revert "[Settings] Code refactor for BroadcastReceiver under...

Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c0

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



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