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

[automerger skipped] Merge "Revert "Persist permission state for updated apps synchronously."" am: f3c204c6 am: 239aa9f3 -s ours am: a1cd6960 -s ours

am skip reason: Merged-In Ib26cf2940beb66bd1f74d0fcfb623f3183367f31 with SHA-1 cebec6c3 is already in history

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



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