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 am: 4d026736

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



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