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: Ic5bac17e7e9e0c461476c42fd7e972839df500fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>