am 5a6f2136: Merge "Fix issue #22185268: apps crash with missing permissions...
am 5a6f2136: Merge "Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsManager" into mnc-dev
* commit '5a6f2136':
Fix issue #22185268: apps crash with missing permissions and NPE on AppOpsManager