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

Merge "Fix wrong permission state changed being notified" am: ab62c6d5 am: 3cb7b3bb am: 9deb015e

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



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