[automerger skipped] Merge "Fix crash due to modifying immutable PersistableBundle" am: 706b376fb7 am: 9aaf4d1e58 am: 4aaca8129d -s ours am: 67bc31ee4f -s ours

am skip reason: Merged-In Ibe6ead59b647b0983516e648d2848e2daa56bf31 with SHA-1 68f2134d63 is already in history

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

Change-Id: I7ea3c55adaa3a764bdf6c0e3683af941508c264c