[automerger skipped] Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev am: f4a80fdfa3
am: 1e035db889
am: 704b69ac35
-s ours
am skip reason: Merged-In I7282c7ba9fbb793056c12928843b6eef59eb2213 with SHA-1 7656542419
is already in history. Merged-In was found from reverted change.
Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102785
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15120295
Change-Id: Iea32756e783c0d0fdcf9fda88d6033c8ac91be23
This commit is contained in: