Merge "Support CarrierService#notifyCarrierNetworkChange with subscription" am: eaa2a701cd am: c37af99d0a am: 48f89c249b am: 7f9a9fd489

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

Change-Id: Ib1af4cc68a27a5ee5d7268b4122bc0f950d2428d