Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9 am: ec4ccdcc5a am: 98957e6d49

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

Change-Id: I7554768a0f5bfac8fd670f906dcf812386f45da5