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 am: 321e06b7 am: 8030a02f

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



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