Merge "Persist permission state for updated apps synchronously." am: 6d1cecb3

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



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