Merge "Persist permission state for updated apps synchronously." into tm-dev...

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

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



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