Merge "Revert "Fix wrong permission state changed being notified"" am:...

Merge "Revert "Fix wrong permission state changed being notified"" am: f66d53b5 am: d2ff2732 am: aeb04893 am: 7fc47d8d

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



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