[automerger skipped] Merge "Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle"" into tm-dev am: b92156c03e
am: c406279030
-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: I13f0fce78d7a156d560c54472f1e8d3999826195 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: