Merge "Persist permission state for updated apps synchronously." into tm-dev am: 5309004a

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



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