[automerger skipped] Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
am: dbbab09d11
am: a725b0c3da
am: 3c4956b7c4
-s ours
am skip reason: skipped by user bonianchen Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950673 Change-Id: I1b4dffff12aa041da05d6b021f23e3fbb5dde7cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: