Merge "Revert "Listen for individual subscription mobile data toggles"" am: 2453899e69 am: e2cf4c3a92

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948456

Change-Id: I0a72a9930bbb4ad0f1a3d6f239c51e6ed32b365a