tree 703935802c89486aa9362681772794424c921da3
parent 33f0b715b21c6eced501ef43f1425fa1be36aa31
parent 4aaca8129db54b5d6cc889906817c9256e80f67b
author Treehugger Robot <treehugger-gerrit@google.com> 1620358804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620358804 +0000

[automerger skipped] Merge "Fix crash due to modifying immutable PersistableBundle" am: 706b376fb7 am: 9aaf4d1e58 am: 4aaca8129d -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: Ic34ddb174dc612789156f9c27c20e19c4bcb9493