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