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

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



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