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: 7b437f90 am: 5c8c5be9 am: bb51f1d8

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



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