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: b6a2a002

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



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