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

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



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