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