Merge "Return PERMISSION_DENIED instead of NPE when missing ActivityManager" into pi-dev