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

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



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