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

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

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



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