[automerger skipped] Merge "Persist permission state for updated apps...

[automerger skipped] Merge "Persist permission state for updated apps synchronously." am: 6d1cecb3 am: 10d3f372 -s ours am: 4d240be9 -s ours

am skip reason: Merged-In Ib82189b07cf4dfd132be37fb19843d770e871f8c with SHA-1 821203f5 is already in history

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



Change-Id: I2ec12f1fd2d2944cf63b2a8e1dedb91426889704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>