Merge "Create a convenience method to get the CarrierService package." am: 18d9d9feb1 am: 7137e2510e

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

Change-Id: I7365de93468c40fd10466ce0e014b355f4f61df0