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

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



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