Merge "Fix crash due to modifying immutable PersistableBundle" am: 706b376fb7

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1698933

Change-Id: I3aeb3cc8c13f1606c53400aba8b686cfe5324b41