Merge "Support CarrierService#notifyCarrierNetworkChange with subscription" am: eaa2a701cd

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

Change-Id: I2da642958ef47e6bd147e13283dbebc6558269c3