Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into...

Merge "[Settings] Code refactor for BroadcastReceiver under Lifecycle" into tm-dev am: 73c8e2f4 am: bad5635b

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



Change-Id: I9ade4e92571b1d10f2abcf6b161c670a2b33713b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>