Merge "Revert "Persist permission state for updated apps synchronously."" into...

Merge "Revert "Persist permission state for updated apps synchronously."" into tm-dev am: 90549066

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



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