Merge "Override the label of the SIM Toolkit application dynamically" am: 98833ee208 am: 79bd307a60

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

Change-Id: I7fcd7fb06beb5dafe8f72d8cff5babd13e73bce2