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

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

Change-Id: I195c2e7745e2c3abf98cca2eeb59ee595f6ec8ee